Skip to content

Rename files about error codes #60025

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom
Merged
merged 8 commits into from
Apr 18, 2019
Merged

Rename files about error codes #60025

merged 8 commits into from
Apr 18, 2019

Conversation

JohnTitor
Copy link
Member

fixes #60017

This PR will be failed in tidy.

The log is here: 
tidy check
tidy error: duplicate error code: 411
tidy error: Documents\GitHub\rust\src\librustc_resolve\diagnostics.rs:83:             __diagnostic_used!(E0411);
tidy error: Documents\GitHub\rust\src\librustc_resolve\diagnostics.rs:84:             err.code(DiagnosticId::Error("E0411".to_owned()));
tidy error: duplicate error code: 424
tidy error: Documents\GitHub\rust\src\librustc_resolve\diagnostics.rs:90:             debug!("smart_resolve_path_fragment: E0424, source={:?}", source);
tidy error: Documents\GitHub\rust\src\librustc_resolve\diagnostics.rs:92:             __diagnostic_used!(E0424);
tidy error: Documents\GitHub\rust\src\librustc_resolve\diagnostics.rs:93:             err.code(DiagnosticId::Error("E0424".to_owned()));
some tidy checks failed

I'd like to fix this but I don't know what to do.
I will work on later. Please let me know if you have any solutions.

r? @petrochenkov

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 16, 2019
@petrochenkov
Copy link
Contributor

cc @rust-lang/wg-diagnostics @GuillaumeGomez

petrochenkov
petrochenkov reviewed Apr 16, 2019
View reviewed changes
@davidtwco
Copy link
Member

davidtwco commented Apr 16, 2019 •
edited
Loading

At a quick glance, you may need to change this line in tidy. It appears as if it looks for a diagnostics.rs and skips the file otherwise (thereby skipping the files you’ve renamed, except for the resolve module where you’ve swapped the module names).

@rust-highfive

This comment has been minimized.

# to view
@GuillaumeGomez
Copy link
Member

Well, looks good to me (renaming to error_codes sounds good to me).

JohnTitor
JohnTitor commented Apr 17, 2019
View reviewed changes
@JohnTitor
Copy link
Member Author

Thank you @davidtwco! It seems good, I changed file name in tidy.

@petrochenkov
Copy link
Contributor

@JohnTitor
Could you 1) update src/doc/rustc-ux-guidelines.md and 2) rename libsyntax/diagnostic_list.rs into error_codes.rs and remove it from tidy.

@petrochenkov petrochenkov added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 17, 2019
@JohnTitor
Copy link
Member Author

@petrochenkov I pushed some commits.

@petrochenkov
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented Apr 18, 2019

📌 Commit a1d2f72 has been approved by petrochenkov

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 18, 2019
@bors
Copy link
Collaborator

bors commented Apr 18, 2019

⌛ Testing commit a1d2f72 with merge d6f513e...

bors added a commit that referenced this pull request Apr 18, 2019
@bors
Auto merge of #60025 - JohnTitor:rename-files, r=petrochenkov
d6f513e 
Rename files about error codes

fixes #60017

This PR will be failed in tidy.

<details>
<summary>The log is here:</summary>

```
tidy check
tidy error: duplicate error code: 411
tidy error: Documents\GitHub\rust\src\librustc_resolve\diagnostics.rs:83:             __diagnostic_used!(E0411);
tidy error: Documents\GitHub\rust\src\librustc_resolve\diagnostics.rs:84:             err.code(DiagnosticId::Error("E0411".to_owned()));
tidy error: duplicate error code: 424
tidy error: Documents\GitHub\rust\src\librustc_resolve\diagnostics.rs:90:             debug!("smart_resolve_path_fragment: E0424, source={:?}", source);
tidy error: Documents\GitHub\rust\src\librustc_resolve\diagnostics.rs:92:             __diagnostic_used!(E0424);
tidy error: Documents\GitHub\rust\src\librustc_resolve\diagnostics.rs:93:             err.code(DiagnosticId::Error("E0424".to_owned()));
some tidy checks failed
```

</details>

I'd like to fix this but I don't know what to do.
I will work on later. Please let me know if you have any solutions.

r? @petrochenkov
@bors
Copy link
Collaborator

bors commented Apr 18, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: petrochenkov
Pushing d6f513e to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 18, 2019
@bors bors merged commit a1d2f72 into rust-lang:master Apr 18, 2019
This was referenced Apr 18, 2019
Merged
Merged
Merged
Merged
Merged
@JohnTitor JohnTitor deleted the rename-files branch April 18, 2019 21:38
@GuillaumeGomez GuillaumeGomez mentioned this pull request Apr 20, 2019
Merged
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@petrochenkov petrochenkov petrochenkov left review comments

@oli-obk oli-obk oli-obk approved these changes

@estebank estebank estebank approved these changes

Assignees

@petrochenkov petrochenkov

Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Error code files (diagnostics.rs) reserve a valuable module name
8 participants
@JohnTitor @petrochenkov @davidtwco @rust-highfive @GuillaumeGomez @bors @oli-obk @estebank